Don't blindly chain up in the buildable implementation. Reported by Kevin

        * gtk/gtkcellview.c: Don't blindly chain up in the buildable
        implementation.  Reported by Kevin Ryde.

svn path=/trunk/; revision=20802

diff --git a/ChangeLog b/ChangeLog
index 8bceb019e84d5bef1c19bfe449a8ae0bfc3d5b3d..d1a28ac5eb8a4be2b15c91df23a5ff85bf110b74 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-07-06  Matthias Clasen  <mclasen@redhat.com>
+
+       Bug 528845 – segv from GtkBuilder on attempting <accelerator> under
+       GtkCellView
+
+       * gtk/gtkcellview.c: Don't blindly chain up in the buildable
+       implementation.  Reported by Kevin Ryde.
+
 2008-07-06  Matthias Clasen  <mclasen@redhat.com>
 
        Bug 469068 – clarify gdk_cairo_create()

diff --git a/gtk/gtkcellview.c b/gtk/gtkcellview.c
index dab19cb8d0f67f917cda1b743f81799f9d475cc2..e5350a526a59bcc865ec2a730156e5da85e91bb2 100644 (file)
--- a/gtk/gtkcellview.c
+++ b/gtk/gtkcellview.c
@@ -1086,7 +1086,8 @@ gtk_cell_view_buildable_custom_tag_start (GtkBuildable  *buildable,
                                          GMarkupParser *parser,
                                          gpointer      *data)
 {
-  if (parent_buildable_iface->custom_tag_start (buildable, builder, child,
+  if (parent_buildable_iface->custom_tag_start &&
+      parent_buildable_iface->custom_tag_start (buildable, builder, child,
                                                tagname, parser, data))
     return TRUE;
 
@@ -1104,7 +1105,7 @@ gtk_cell_view_buildable_custom_tag_end (GtkBuildable *buildable,
   if (strcmp (tagname, "attributes") == 0)
     _gtk_cell_layout_buildable_custom_tag_end (buildable, builder, child, tagname,
                                               data);
-  else
+  else if (parent_buildable_iface->custom_tag_end)
     parent_buildable_iface->custom_tag_end (buildable, builder, child, tagname,
                                            data);
 }